* lisp/server.el (server-force-stop): Ensure the server is stopped (Bug#7409).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71d72c699798465fa82c27139db11c7b09ed5175..c24ca0026ac9dd88eb845b752fe8f7b8318d4e71 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-16  Ulrich Mueller  <ulm@gentoo.org>
+
+       * server.el (server-force-stop): Ensure the server is stopped (Bug#7409).
+
 2010-11-13  Eli Zaretskii  <eliz@gnu.org>
 
        * subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)

diff --git a/lisp/server.el b/lisp/server.el
index 17d6743a0f77fbb04cc4006c035bc7b57221b94a..6297cc82ab0780f28d3c4b8227bca0547b05bc27 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -594,7 +594,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
 (defun server-force-stop ()
   "Kill all connections to the current server.
 This function is meant to be called from `kill-emacs-hook'."
-  (server-start nil t))
+  (server-start t t))
 
 ;;;###autoload
 (defun server-force-delete (&optional name)